types: Clean up gtkwidget.h includes

In particular gtksettings.h and gtkstylecontext.h needed to be included
in lots of places now.

Also, I order the includes alphabetically in a bunch of headers.

diff --git a/gtk/deprecated/gtkhsv.c b/gtk/deprecated/gtkhsv.c
index f3befe42f3a3a75dfae27b2ff119bf85b00e2694..ad09515336be20b2194a440dd2504a6a623a2e76 100644 (file)
--- a/gtk/deprecated/gtkhsv.c
+++ b/gtk/deprecated/gtkhsv.c
@@ -37,6 +37,7 @@
 #include "gtkhsv.h"
 #include "gtkbindings.h"
 #include "gtkmarshalers.h"
+#include "gtkstylecontext.h"
 #include "gtktypebuiltins.h"
 #include "gtkintl.h"
 

diff --git a/gtk/deprecated/gtktearoffmenuitem.c b/gtk/deprecated/gtktearoffmenuitem.c
index 99f5f0918b9b13b1763152e677ec8458a1660cb5..d5528bbc32c1a03ce67ce99e1750e522f935ee3c 100644 (file)
--- a/gtk/deprecated/gtktearoffmenuitem.c
+++ b/gtk/deprecated/gtktearoffmenuitem.c
@@ -26,6 +26,7 @@
 
 #include "gtkmenuprivate.h"
 #include "gtkmenuitemprivate.h"
+#include "gtkstylecontext.h"
 #include "gtktearoffmenuitem.h"
 #include "gtkintl.h"
 

diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c
index c863b568e88d86d2ee75574c262313555a054c57..04b947109433552e335e788fc1571979e5d752e1 100644 (file)
--- a/gtk/gtkapplicationwindow.c
+++ b/gtk/gtkapplicationwindow.c
@@ -28,6 +28,7 @@
 #include "gtkaccelgroup.h"
 #include "gtkaccelmap.h"
 #include "gtkintl.h"
+#include "gtksettings.h"
 
 #include <gdk/gdk.h>
 #ifdef GDK_WINDOWING_X11

diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index cd78b6cc3c2c9f5b5b8b1733065f1504753e6718..18313e693fe8fbb87c8c56dea22a500c702f255c 100644 (file)
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -66,6 +66,7 @@
 #include "gtknotebook.h"
 #include "gtkimage.h"
 #include "gtklabel.h"
+#include "gtksettings.h"
 #include "gtksizegroup.h"
 #include "gtksizerequest.h"
 #include "gtkstock.h"

diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index da50fde427a92269c35c416a555be208ceda66ab..4cbbeaf6aadbb67cd9e0c9981f00b256363ef54a 100644 (file)
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -31,6 +31,7 @@
 
 #include "gtkbindingsprivate.h"
 #include "gtkkeyhash.h"
+#include "gtkstylecontext.h"
 #include "gtkwidget.h"
 #include "gtkintl.h"
 

diff --git a/gtk/gtkcellrendererspinner.c b/gtk/gtkcellrendererspinner.c
index 1aedcca859813138eff2eca8cfb3e880ccf12f9f..e6a41597a8f8c9cde5f436314413c7a7aa2e293f 100644 (file)
--- a/gtk/gtkcellrendererspinner.c
+++ b/gtk/gtkcellrendererspinner.c
@@ -30,8 +30,9 @@
 #include "gtkcellrendererspinner.h"
 #include "gtkiconfactory.h"
 #include "gtkicontheme.h"
-#include "gtktypebuiltins.h"
 #include "gtkintl.h"
+#include "gtksettings.h"
+#include "gtktypebuiltins.h"
 
 #undef GDK_DEPRECATED
 #undef GDK_DEPRECATED_FOR

diff --git a/gtk/gtkcoloreditor.c b/gtk/gtkcoloreditor.c
index 4947e72285f11236467f4d350010bde4e765fe97..8cbbf21541c48e7141fa7c7253da69d7653243ef 100644 (file)
--- a/gtk/gtkcoloreditor.c
+++ b/gtk/gtkcoloreditor.c
@@ -39,6 +39,7 @@
 #include "gtklabel.h"
 #include "gtkspinbutton.h"
 #include "gtkintl.h"
+#include "gtkstylecontext.h"
 
 #include <math.h>
 

diff --git a/gtk/gtkcolorplaneprivate.h b/gtk/gtkcolorplaneprivate.h
index 34bf2ad2cb15b51f32270152ac0730d003fb0f7c..560e892f787fc66f0e9c7035f38cd80ef4d95ab1 100644 (file)
--- a/gtk/gtkcolorplaneprivate.h
+++ b/gtk/gtkcolorplaneprivate.h
@@ -22,6 +22,7 @@
 #ifndef __GTK_COLOR_PLANE_H__
 #define __GTK_COLOR_PLANE_H__
 
+#include <gtk/gtkadjustment.h>
 #include <gtk/gtkdrawingarea.h>
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 452a4680842530c3f708d62d268c33838a5a8e2f..87b46a3e51160e64f7de0a6a00c39bc953f285b7 100644 (file)
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -39,6 +39,7 @@
 #include "gtkbindings.h"
 #include "gtkprivate.h"
 #include "gtkbuildable.h"
+#include "gtksettings.h"
 
 /**
  * SECTION:gtkdialog

diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c
index 1f721b5825867b6024304dd7958f6c9dfcef1234..912992bfe8d8b41c2b2b2951ce6054ee04eb661b 100644 (file)
--- a/gtk/gtkdrawingarea.c
+++ b/gtk/gtkdrawingarea.c
@@ -25,6 +25,7 @@
 #include "config.h"
 #include "gtkdrawingarea.h"
 #include "gtkintl.h"
+#include "gtkstylecontext.h"
 
 
 /**

diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 002fea5b8ee1e18855c77ef0a9aae6f11581aeb1..d1e2d2eed0900df721a4e965f254035778f6ec6e 100644 (file)
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -54,6 +54,7 @@
 
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
+#include "gtksettings.h"
 
 
 /**

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 455c61c2f658ba81136835cf8ec49b08ea7fa25d..7559d2d453e52d179ea30a8904b46b4698d11c20 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -39,7 +39,7 @@
 #include "gtkfilesystem.h"
 #include "gtkfilesystemmodel.h"
 #include "gtkframe.h"
-#include "gtkpaned.h"
+#include "gtkgrid.h"
 #include "gtkiconfactory.h"
 #include "gtkicontheme.h"
 #include "gtkimage.h"
@@ -49,6 +49,7 @@
 #include "gtkmarshalers.h"
 #include "gtkmessagedialog.h"
 #include "gtkmountoperation.h"
+#include "gtkpaned.h"
 #include "gtkpathbar.h"
 #include "gtkprivate.h"
 #include "gtkradiobutton.h"
@@ -56,10 +57,10 @@
 #include "gtkrecentmanager.h"
 #include "gtkscrolledwindow.h"
 #include "gtkseparatormenuitem.h"
+#include "gtksettings.h"
 #include "gtksizegroup.h"
 #include "gtksizerequest.h"
 #include "gtkstock.h"
-#include "gtkgrid.h"
 #include "gtktoolbar.h"
 #include "gtktoolbutton.h"
 #include "gtktooltip.h"

diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h
index a40af425e0cc1cc9db42141ebd472f0f03525987..8e49e62de43921bf205e4fb56fb34c627a114faf 100644 (file)
--- a/gtk/gtkiconfactory.h
+++ b/gtk/gtkiconfactory.h
@@ -30,9 +30,8 @@
 #define __GTK_ICON_FACTORY_H__
 
 #include <gdk/gdk.h>
-#include <gtk/gtksettings.h>
 #include <gtk/gtkenums.h>
-#include <gtk/gtkwidgetpath.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 
@@ -50,12 +49,6 @@ typedef struct _GtkIconFactory              GtkIconFactory;
 typedef struct _GtkIconFactoryPrivate       GtkIconFactoryPrivate;
 typedef struct _GtkIconFactoryClass         GtkIconFactoryClass;
 
-typedef struct _GtkIconSet     GtkIconSet;
-typedef struct _GtkIconSource  GtkIconSource;
-
-typedef struct _GtkStyle               GtkStyle;
-typedef struct _GtkRcStyle             GtkRcStyle;
-
 struct _GtkIconFactory
 {
   GObject parent_instance;

diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index ada2bdeb48b8b0504a47146b8b5a942a73349217..2b887b9607c1597b836b114e392ecae9218e8ac8 100644 (file)
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -22,12 +22,13 @@
 
 #include "gtkimmulticontext.h"
 #include "gtkimmoduleprivate.h"
+#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkmain.h"
+#include "gtkprivate.h"
 #include "gtkradiomenuitem.h"
 #include "gtkseparatormenuitem.h"
-#include "gtkintl.h"
-#include "gtkprivate.h"
+#include "gtksettings.h"
 
 
 /**

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 3d70ed6f9210bc825f3245fac21378d99936d411..5a7b166748908a7c89cde86c14da3dcc1db2f0a0 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -40,6 +40,7 @@
 #include "gtkactivatable.h"
 #include "gtkwidgetprivate.h"
 #include "gtkintl.h"
+#include "gtksettings.h"
 #include "gtktypebuiltins.h"
 #include "a11y/gtkmenuitemaccessible.h"
 

diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index d8b9f9e5261e4970b4104b9190ab6e7c33ffc931..101f884f78ef88bd8f166723d834bc7c20d66ab5 100644 (file)
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -22,17 +22,18 @@
 
 #include <string.h>
 
-#include "gtktogglebutton.h"
 #include "gtkarrow.h"
+#include "gtkbox.h"
 #include "gtkdnd.h"
+#include "gtkiconfactory.h"
+#include "gtkicontheme.h"
 #include "gtkimage.h"
 #include "gtkintl.h"
-#include "gtkicontheme.h"
-#include "gtkiconfactory.h"
 #include "gtklabel.h"
-#include "gtkbox.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
+#include "gtksettings.h"
+#include "gtktogglebutton.h"
 
 
 enum {

diff --git a/gtk/gtkseparatormenuitem.c b/gtk/gtkseparatormenuitem.c
index 0afdc096877b1533e49f110486d428f7f7eaa4b2..da721297067eac0f0572bc7c821fdedf2e9c58d2 100644 (file)
--- a/gtk/gtkseparatormenuitem.c
+++ b/gtk/gtkseparatormenuitem.c
@@ -23,8 +23,11 @@
  */
 
 #include "config.h"
+
 #include "gtkseparatormenuitem.h"
 
+#include "gtkstylecontext.h"
+
 /**
  * SECTION:gtkseparatormenuitem
  * @Short_description: A separator used in menus

diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h
index 8ada7118582881d39115ad8d54d2d1982c796e4a..4a33093377582ac946d4ed9e15711137e2b506d0 100644 (file)
--- a/gtk/gtksettings.h
+++ b/gtk/gtksettings.h
@@ -23,6 +23,7 @@
 #define __GTK_SETTINGS_H__
 
 #include <gdk/gdk.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 
@@ -37,17 +38,11 @@ G_BEGIN_DECLS
 
 
 /* --- typedefs --- */
-typedef struct _GtkSettings GtkSettings;
 typedef struct _GtkSettingsPrivate GtkSettingsPrivate;
 typedef struct _GtkSettingsClass GtkSettingsClass;
 typedef struct _GtkSettingsValue GtkSettingsValue;
 
 
-typedef gboolean (*GtkRcPropertyParser) (const GParamSpec *pspec,
-                                         const GString    *rc_string,
-                                         GValue           *property_value);
-
-
 /* --- structures --- */
 struct _GtkSettings
 {

diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index ce336d8f386dca0557a73aa49bc632d4451c74aa..532ed07b331db5efa2a521cdc3bc4da0cc529e26 100644 (file)
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -29,10 +29,11 @@
 
 #include "config.h"
 
-#include "gtkintl.h"
-#include "gtkaccessible.h"
-#include "gtkimage.h"
 #include "gtkspinner.h"
+
+#include "gtkimage.h"
+#include "gtkintl.h"
+#include "gtkstylecontext.h"
 #include "a11y/gtkspinneraccessible.h"
 
 

diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 5cbebec18a411c944a039d9185ef1ed608c6bdce..a46be6fa54130b6faa92ee2dfc5e71379763dadb 100644 (file)
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -36,6 +36,7 @@
 #include "gtkiconfactory.h"
 #include "gtkwidgetprivate.h"
 #include "gtkstyleproviderprivate.h"
+#include "gtksettings.h"
 
 /**
  * SECTION:gtkstylecontext

diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h
index dc528ef8dc37843630989fe9da7fac91cc305557..65725374fae78ab1defb3b418a41e53320bfae29 100644 (file)
--- a/gtk/gtkstylecontext.h
+++ b/gtk/gtkstylecontext.h
@@ -22,11 +22,10 @@
 #ifndef __GTK_STYLE_CONTEXT_H__
 #define __GTK_STYLE_CONTEXT_H__
 
-#include <glib-object.h>
+#include <gtk/gtkborder.h>
 #include <gtk/gtkcsssection.h>
 #include <gtk/gtkstyleprovider.h>
-#include <gtk/gtkwidgetpath.h>
-#include <gtk/gtkborder.h>
+#include <gtk/gtktypes.h>
 #include <atk/atk.h>
 
 G_BEGIN_DECLS
@@ -38,7 +37,6 @@ G_BEGIN_DECLS
 #define GTK_IS_STYLE_CONTEXT_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE    ((c), GTK_TYPE_STYLE_CONTEXT))
 #define GTK_STYLE_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS  ((o), GTK_TYPE_STYLE_CONTEXT, GtkStyleContextClass))
 
-typedef struct _GtkStyleContext GtkStyleContext;
 typedef struct _GtkStyleContextClass GtkStyleContextClass;
 typedef struct _GtkStyleContextPrivate GtkStyleContextPrivate;
 

diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 84c80e617140510ed9eb700b543aa0e12f82ccbf..eaf94b8dd1f6d5bc76f75b49b54849b98ec793a1 100644 (file)
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -30,7 +30,9 @@
 #include "gtklabel.h"
 #include "gtkimage.h"
 #include "gtkbox.h"
+#include "gtksettings.h"
 #include "gtksizerequest.h"
+#include "gtkstylecontext.h"
 #include "gtkwindowprivate.h"
 
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 0f47c07beee331357cf125e4c84e0edb2a460b49..c22eeb1bcc786b96e5b969c3a500e3ffe15d1cbc 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -48,6 +48,7 @@
 #include "gtkstylecontextprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkmain.h"
+#include "gtksettings.h"
 #include "a11y/gtktreeviewaccessible.h"
 
 

diff --git a/gtk/gtktypes.h b/gtk/gtktypes.h
index 67554557b998bb3a7a7796924c8e1f2f26b5c387..a14457879af515ab8e5e668d53aaad787b6ba6f6 100644 (file)
--- a/gtk/gtktypes.h
+++ b/gtk/gtktypes.h
@@ -29,18 +29,27 @@
 #ifndef __GTK_TYPES_H__
 #define __GTK_TYPES_H__
 
-#include <gdk/gdk.h>
-
 G_BEGIN_DECLS
 
 typedef struct _GtkClipboard          GtkClipboard;
+typedef struct _GtkIconSet             GtkIconSet;
+typedef struct _GtkIconSource          GtkIconSource;
+typedef struct _GtkRcStyle             GtkRcStyle;
 typedef struct _GtkRequisition        GtkRequisition;
 typedef struct _GtkSelectionData       GtkSelectionData;
+typedef struct _GtkSettings            GtkSettings;
+typedef struct _GtkStyle               GtkStyle;
+typedef struct _GtkStyleContext        GtkStyleContext;
 typedef struct _GtkTooltip             GtkTooltip;
 typedef struct _GtkWidget              GtkWidget;
 typedef struct _GtkWidgetPath          GtkWidgetPath;
 typedef struct _GtkWindow              GtkWindow;
 
+
+typedef gboolean (*GtkRcPropertyParser) (const GParamSpec *pspec,
+                                         const GString    *rc_string,
+                                         GValue           *property_value);
+
 G_END_DECLS
 
 #endif /* __GTK_TYPES_H__ */

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index c234d4d8dd83e1212c415dfde0b4a87191c4abc8..5a4ac4ff42f50ed016c8770366c6917b7a356ad0 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -31,10 +31,7 @@
 
 #include <gdk/gdk.h>
 #include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkadjustment.h>
 #include <gtk/gtkborder.h>
-#include <gtk/gtksettings.h>
-#include <gtk/gtkstylecontext.h>
 #include <gtk/gtktypes.h>
 #include <atk/atk.h>